pod logs enhancements: option to color logs by kbaran1998 · Pull Request #13490 · podman-container-tools/podman

kbaran1998 · 2022-03-11T17:20:18Z

Created an option to colourise pod logs with an option --color. You can recreate with the following steps:

Create a pod with containers

bin/podman pod create --name=pod_testlogs; bin/podman run --name=testlogs_loop1_1 -d --pod=pod_testlogs busybox /bin/sh -c 'for i in `seq 1 10000`; do echo "loop1: $i"; sleep 1; done'; bin/podman run --name=testlogs_loop2_1 -d --pod=pod_testlogs busybox /bin/sh -c 'for i in `seq 1 10000`; do echo "loop2: $i"; sleep 3; done';

Logs with colour:

bin/podman pod logs --tail=10 -f --color pod_testlogs

Kill all pods and remove containers:

bin/podman kill --all; bin/podman rm --all; bin/podman pod rm --all

Closes #13266

rhatdan · 2022-03-13T15:04:41Z

remove extra blank lines.

rhatdan · 2022-03-13T15:04:53Z

remove extra blank lines.

rhatdan · 2022-03-13T15:06:04Z

Obove the option is --colors?

Why plural? I think just --color would be even better.

could we make it a string so in future we can extend it if needed?

e.g. GNU diff and ls have --color={never,always,auto} where --color=auto detects if the stdout is a tty before turning on colors.

We can also extend a bool in the future, it is easy to change it to a string while still keeping the --color only syntax.

rhatdan · 2022-03-13T15:07:58Z

Just use Colors and option.Colors

rhatdan · 2022-03-13T15:08:58Z

Please rebase and force push your commit. There should only be one commit.

rhatdan · 2022-03-17T11:13:05Z

Your PR is still includes many old PRs please rebase and only submit your changes.

rhatdan · 2022-03-24T12:55:29Z

You need to do something like

git pull origin main
git rebase -i origin
Remove all of the code in the rebase that you did not add and squash all of your commits into a single PR
then do a
git push --force

kbaran1998 · 2022-03-24T15:17:50Z

@rhatdan Whenever I squash only what I added into 1 commit, I get the 884 changes and whenever I rebase, I get back 7 commits...

And if I follow instructions in DCO from the line:
To add your Signed-off-by line to every commit in this branch:

I will get back to 7 commits and 13 changes.

I seem to be going in a loop.

mheon · 2022-03-24T15:39:27Z

I recommend git fetch to fetch the changes, and then a git rebase upstream/main (where upstream points to this repo, not your fork) to apply your changes on top of latest main

rhatdan · 2022-03-24T20:04:50Z

Do
git pull upstream main
And then
git rebase -i origin
And see if that clears it up

rhatdan · 2022-03-25T09:10:41Z

Almost there.

Now cleanup your commit message. removing the excess text.

git commit -a --amend -s
git push --force

Should do it, and then the DCO should pass.

TomSweeneyRedHat · 2022-03-25T21:47:24Z

nit

Suggested change

podman container logs --color --names ctrID1 ctrID2

podman container logs --color --names ctrID1 ctrID2

kbaran1998 · 2022-03-28T18:46:57Z

For some reason, a test in test/e2e/run_test.go called podman run user capabilities test (line 467) is failing on the pipeline and locally, and I am not sure why. Specifically, it is giving me this output:

time="2022-03-28T20:30:41+02:00" level=warning msg="\"/\" is not a shared mount, this could cause issues or missing mounts with rootless containers"
CapBnd: 00000000a80425fb
CapEff: 0000000000000000
CapInh: 0000000000000000
CapBnd: 00000000a80425fb
CapEff: 00000000a80425fb
CapInh: 00000000a80425fb
CapBnd: 00000000a80425fb
CapEff: 00000000a80425fb
CapAmb: 0000000000000002
CapInh: 0000000000000002
CapAmb: 0000000000000000
CapAmb: 0000000000000000
CapInh: 00000000a80425fb
CapAmb: 0000000000000002
CapInh: 0000000000000000

------------------------------
• Failure [17.948 seconds]
Podman run
/usr/local/go/src/github.com/containers/podman/test/e2e/run_test.go:25
  podman run user capabilities test [It]
  /usr/local/go/src/github.com/containers/podman/test/e2e/run_test.go:467

  Expected
      <string>: CapInh: 0000000000000000
  to contain substring
      <string>: 0000000000000002

  /usr/local/go/src/github.com/containers/podman/test/e2e/run_test.go:553
------------------------------
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSintegration timing results
podman run user capabilities test               17.947786
"unlinkat /tmp/podman/imagecachedir/vfs/dir/2fa52ae883433bc788d7fa1737ca50d2802e0e39d71cae30b4c49378c1207a17/home: permission denied"


Summarizing 1 Failure:

[Fail] Podman run [It] podman run user capabilities test 
/usr/local/go/src/github.com/containers/podman/test/e2e/run_test.go:553

Ran 1 of 114 Specs in 41.103 seconds
FAIL! -- 0 Passed | 1 Failed | 0 Pending | 113 Skipped
--- FAIL: TestLibpod (41.12s)
FAIL
FAIL    command-line-arguments  41.131s
FAIL

I used this command to recreate the error:

GOPATH=~/go go test -v test/e2e/libpod_suite_test.go test/e2e/common_test.go test/e2e/config.go test/e2e/config_amd64.go test/e2e/run_test.go

Would anyone know what could possibly be causing this?

rhatdan · 2022-03-28T18:48:03Z

You need to rebase your PR.

git pull origin main
git rebase -i origin
git push --force

TomSweeneyRedHat · 2022-03-29T02:28:52Z

@kbaran1998 you're still fighting DCO issues, looks like two of your commits are unsigned. Please see: https://github.com/containers/podman/pull/13490/checks?check_run_id=5727855035

Signed-off-by: Krzysztof Baran <krysbaran@gmail.com> Signed-off-by: gcalin <caling@protonmail.com>

TomSweeneyRedHat · 2022-04-02T21:51:28Z

LGTM
and happy green test buttons
Thanks @kbaran1998 !

rhatdan · 2022-04-04T17:41:57Z

Thanks @kbaran1998
/lgtm
/approve

openshift-ci · 2022-04-04T17:42:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kbaran1998, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 11, 2022

kbaran1998 force-pushed the 13266 branch from b342085 to 7f22c60 Compare March 11, 2022 17:22

openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 11, 2022

kbaran1998 mentioned this pull request Mar 12, 2022

podman pod logs enhancements: option to color logs #13266

Closed

rhatdan approved these changes Mar 13, 2022

View reviewed changes

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 13, 2022

openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 16, 2022

kbaran1998 force-pushed the 13266 branch from 0326257 to 5a0a0fd Compare March 16, 2022 15:17

kbaran1998 requested a review from rhatdan March 16, 2022 15:28

keonchennl force-pushed the 13266 branch 9 times, most recently from c5e16ee to 9a523ab Compare March 18, 2022 16:35

kbaran1998 force-pushed the 13266 branch from 9a523ab to 514caf3 Compare March 18, 2022 16:42

keonchennl force-pushed the 13266 branch 2 times, most recently from f2689ec to c62587e Compare March 18, 2022 16:55

kbaran1998 force-pushed the 13266 branch from c62587e to f679f1f Compare March 18, 2022 17:03

keonchennl force-pushed the 13266 branch 2 times, most recently from 5b4c683 to 283fd60 Compare March 18, 2022 17:15

openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2022

kbaran1998 force-pushed the 13266 branch from 87c858a to 027e051 Compare March 24, 2022 00:28

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2022

kbaran1998 force-pushed the 13266 branch from 027e051 to 3166982 Compare March 24, 2022 08:38

openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2022

kbaran1998 force-pushed the 13266 branch 5 times, most recently from 80d9a4d to a54a783 Compare March 24, 2022 10:38

openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 24, 2022

kbaran1998 force-pushed the 13266 branch from 8f387b8 to e995856 Compare March 24, 2022 10:54

openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 24, 2022

kbaran1998 force-pushed the 13266 branch from f9dead0 to ed5b670 Compare March 24, 2022 11:37

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2022

TomSweeneyRedHat reviewed Mar 25, 2022

View reviewed changes

Add option for pod logs to display different colors per container.

c185d8c

Signed-off-by: Krzysztof Baran <krysbaran@gmail.com> Signed-off-by: gcalin <caling@protonmail.com>

	podman container logs --color --names ctrID1 ctrID2
	podman container logs --color --names ctrID1 ctrID2

Uh oh!

Conversation

kbaran1998 commented Mar 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rhatdan commented Mar 13, 2022

Uh oh!

rhatdan commented Mar 17, 2022

Uh oh!

rhatdan commented Mar 24, 2022

Uh oh!

kbaran1998 commented Mar 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mheon commented Mar 24, 2022

Uh oh!

rhatdan commented Mar 24, 2022

Uh oh!

rhatdan commented Mar 25, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kbaran1998 commented Mar 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rhatdan commented Mar 28, 2022

Uh oh!

TomSweeneyRedHat commented Mar 29, 2022

Uh oh!

TomSweeneyRedHat commented Apr 2, 2022

Uh oh!

rhatdan commented Apr 4, 2022

Uh oh!

openshift-ci Bot commented Apr 4, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

kbaran1998 commented Mar 11, 2022 •

edited

Loading

kbaran1998 commented Mar 24, 2022 •

edited

Loading

kbaran1998 commented Mar 28, 2022 •

edited

Loading